Git In Laravel. Part 2 - Conflicts And Better Pull Requests